Make ns16550 rework on tiger4 box

Signed-off-by Kevin Tian <kevin.tian@intel.com>

diff --git a/xen/arch/ia64/pcdp.c b/xen/arch/ia64/pcdp.c
index cab5eb2ff59498d0ffe32f00b3157c78c5c65651..9cae51129a110f41e7f948ffd5d28c5828d6233d 100644 (file)
--- a/xen/arch/ia64/pcdp.c
+++ b/xen/arch/ia64/pcdp.c
@@ -24,11 +24,11 @@ static int __init
 setup_serial_console(struct pcdp_uart *uart)
 {
 #ifdef XEN
-       extern struct ns16550_defaults ns16550_com1;
-       ns16550_com1.baud = uart->baud;
-       ns16550_com1.io_base = uart->addr.address;
+       extern struct ns16550_defaults ns16550_com;
+       ns16550_com.baud = uart->baud;
+       ns16550_com.io_base = uart->addr.address;
        if (uart->bits)
-               ns16550_com1.data_bits = uart->bits;
+               ns16550_com.data_bits = uart->bits;
        return 0;
 #else
 #ifdef CONFIG_SERIAL_8250_CONSOLE

diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
index f27bedf0e2230630efb04bfc69248f4d5398b657..8553e2bcf4ee409d5b6738f904755c2679a80ecf 100644 (file)
--- a/xen/arch/ia64/xensetup.c
+++ b/xen/arch/ia64/xensetup.c
@@ -130,7 +130,7 @@ void early_cmdline_parse(char **cmdline_p)
     return;
 }
 
-struct ns16550_defaults ns16550_com1 = {
+struct ns16550_defaults ns16550_com = {
     .data_bits = 8,
     .parity    = 'n',
     .stop_bits = 1
@@ -158,7 +158,14 @@ void start_kernel(void)
 
     /* We initialise the serial devices very early so we can get debugging. */
     if (running_on_sim) hpsim_serial_init();
-    else ns16550_init(0, &ns16550_com1);
+    else {
+       ns16550_com.io_base = 0x3f8;
+       ns16550_com.irq     = 4;
+       ns16550_init(0, &ns16550_com);
+       ns16550_com.io_base = 0x2f8;
+       ns16550_com.irq     = 3;
+       ns16550_init(1, &ns16550_com);
+    }
     serial_init_preirq();
 
     init_console();